makebranch: update openwrt-keyring package with target version

On branching for a new version, also update the openwrt-keyring to
install the specific .pem key.

Signed-off-by: Christian Marangi <[email protected]>

diff --git a/makebranch.sh b/makebranch.sh
index 0e3974985e0ffc99dbb14f5cd85672bc79049fc0..7a82de677fc0fe0831c3a0cf1e97a2a30c36c2ea 100755 (executable)
--- a/makebranch.sh
+++ b/makebranch.sh
@@ -138,10 +138,15 @@ sed -e 's!\(http\|https\)://downloads.\(openwrt\|lede-project\).org/[^"]*!'"$bas
        package/base-files/image-config.in > package/base-files/image-config.branch && \
                mv package/base-files/image-config.branch package/base-files/image-config.in
 
        package/base-files/image-config.in > package/base-files/image-config.branch && \
                mv package/base-files/image-config.branch package/base-files/image-config.in
 

+sed -e 's!openwrt-.*.pem!openwrt-'"$version"'.pem!g' \
+       package/system/openwrt-keyring/Makefile > package/system/openwrt-keyring/Makefile.branch && \
+               mv package/system/openwrt-keyring/Makefile.branch package/system/openwrt-keyring/Makefile
+

 git commit -sm "${distname:-OpenWrt} v$version: set branch defaults" \
        feeds.conf.default \
        include/version.mk \
 git commit -sm "${distname:-OpenWrt} v$version: set branch defaults" \
        feeds.conf.default \
        include/version.mk \

-       package/base-files/image-config.in
+       package/base-files/image-config.in \
+       package/system/openwrt-keyring/Makefile

 
 git --no-pager log -p -1
 git checkout "${prev_branch#refs/heads/}"
 
 git --no-pager log -p -1
 git checkout "${prev_branch#refs/heads/}"